From: Florian Müllner Date: Sun, 8 Mar 2020 14:04:46 +0000 (+0100) Subject: extensionPrefs: Move desktop file and icons from top-level data X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~120 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b92ddc0d3930dc11a139d114224dbbf797dfa005;p=gnome-shell.git extensionPrefs: Move desktop file and icons from top-level data Another small step towards making the extensions app code self-contained ... https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1081 --- diff --git a/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg b/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg deleted file mode 100644 index 60c1018b4..000000000 --- a/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg b/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg deleted file mode 100644 index 496be6b4e..000000000 --- a/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg b/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg deleted file mode 100644 index 4208a4d43..000000000 --- a/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/icons/meson.build b/data/icons/meson.build deleted file mode 100644 index eff6e4b53..000000000 --- a/data/icons/meson.build +++ /dev/null @@ -1 +0,0 @@ -install_subdir('hicolor', install_dir: icondir) diff --git a/data/meson.build b/data/meson.build index 87b52ce54..2146ce5bf 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,5 @@ desktop_files = [ 'org.gnome.Shell.desktop', - 'org.gnome.Extensions.desktop', ] service_files = [] @@ -43,7 +42,6 @@ endforeach subdir('dbus-interfaces') -subdir('icons') subdir('theme') data_resources = [ diff --git a/data/org.gnome.Extensions.desktop.in.in b/data/org.gnome.Extensions.desktop.in.in deleted file mode 100644 index 008fe1d73..000000000 --- a/data/org.gnome.Extensions.desktop.in.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Extensions -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=org.gnome.Extensions -Comment=Configure GNOME Shell Extensions -Exec=@bindir@/gnome-shell-extension-prefs %u -Categories=GNOME;GTK; -OnlyShowIn=GNOME; diff --git a/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg b/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg new file mode 100644 index 000000000..60c1018b4 --- /dev/null +++ b/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg b/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg new file mode 100644 index 000000000..496be6b4e --- /dev/null +++ b/js/extensionPrefs/data/icons/hicolor/scalable/apps/org.gnome.Extensions.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg b/js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg new file mode 100644 index 000000000..4208a4d43 --- /dev/null +++ b/js/extensionPrefs/data/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/extensionPrefs/data/icons/meson.build b/js/extensionPrefs/data/icons/meson.build new file mode 100644 index 000000000..eff6e4b53 --- /dev/null +++ b/js/extensionPrefs/data/icons/meson.build @@ -0,0 +1 @@ +install_subdir('hicolor', install_dir: icondir) diff --git a/js/extensionPrefs/data/meson.build b/js/extensionPrefs/data/meson.build index 424d14410..2f43ae180 100644 --- a/js/extensionPrefs/data/meson.build +++ b/js/extensionPrefs/data/meson.build @@ -5,3 +5,25 @@ gnome.compile_resources( install: true, install_dir: pkgdatadir ) + +desktopconf = configuration_data() +# We substitute in bindir so it works as an autostart +# file when built in a non-system prefix +desktopconf.set('bindir', bindir) +desktopconf.set('app_id', app_id) +desktopconf.set('prgname', prgname) + +i18n.merge_file('desktop', + input: configure_file( + input: app_id + '.desktop.in.in', + output: app_id + '.desktop.in', + configuration: desktopconf + ), + output: app_id + '.desktop', + po_dir: po_dir, + install: true, + install_dir: desktopdir, + type: 'desktop' +) + +subdir('icons') diff --git a/js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in b/js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in new file mode 100644 index 000000000..2806c795e --- /dev/null +++ b/js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Extensions +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=@app_id@ +Comment=Configure GNOME Shell Extensions +Exec=@bindir@/@prgname@ %u +Categories=GNOME;GTK; +OnlyShowIn=GNOME; diff --git a/po/POTFILES.in b/po/POTFILES.in index e72dc7e26..4cb847888 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,10 +1,10 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/50-gnome-shell-system.xml -data/org.gnome.Extensions.desktop.in.in data/org.gnome.Shell.desktop.in.in data/org.gnome.shell.gschema.xml.in data/org.gnome.Shell.PortalHelper.desktop.in.in +js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in js/extensionPrefs/js/main.js js/extensionPrefs/data/ui/extension-row.ui js/extensionPrefs/data/ui/extensions-window.ui